From ae8c871565e7a13159eb2a0839053f1b5b6bcfc4 Mon Sep 17 00:00:00 2001
From: Jonathan Fabian <jonfabe@github>
Date: Sun, 21 Dec 2014 19:29:34 -0500
Subject: Added Depth Strider enchantment

---
 src/Enchantments.cpp | 15 +++++++++++++++
 src/Enchantments.h   |  1 +
 2 files changed, 16 insertions(+)

diff --git a/src/Enchantments.cpp b/src/Enchantments.cpp
index e72ec668a..5ed18de6b 100644
--- a/src/Enchantments.cpp
+++ b/src/Enchantments.cpp
@@ -183,6 +183,7 @@ int cEnchantments::StringToEnchantmentID(const AString & a_EnchantmentName)
 		{ enchRespiration,          "Respiration"},
 		{ enchAquaAffinity,         "AquaAffinity"},
 		{ enchThorns,               "Thorns"},
+		{ enchDepthStrider,         "DepthStrider"},
 		{ enchSharpness,            "Sharpness"},
 		{ enchSmite,                "Smite"},
 		{ enchBaneOfArthropods,     "BaneOfArthropods"},
@@ -506,6 +507,20 @@ void cEnchantments::AddItemEnchantmentWeights(cWeightedEnchantments & a_Enchantm
 			{
 				AddEnchantmentWeightToVector(a_Enchantments, 5, enchFeatherFalling, 1);
 			}
+			
+			// Depth Strider
+			if ((a_EnchantmentLevel >= 30) && (a_EnchantmentLevel <= 45))
+			{
+				AddEnchantmentWeightToVector(a_Enchantments, 2, enchDepthStrider, 3);
+			}
+			else if ((a_EnchantmentLevel >= 20) && (a_EnchantmentLevel <= 35))
+			{
+				AddEnchantmentWeightToVector(a_Enchantments, 2, enchDepthStrider, 2);
+			}
+			else if ((a_EnchantmentLevel >= 10) && (a_EnchantmentLevel <= 25))
+			{
+				AddEnchantmentWeightToVector(a_Enchantments, 2, enchDepthStrider, 1);
+			}
 		}
 	}
 
diff --git a/src/Enchantments.h b/src/Enchantments.h
index 31226b5c2..e8e84d43c 100644
--- a/src/Enchantments.h
+++ b/src/Enchantments.h
@@ -53,6 +53,7 @@ public:
 		enchRespiration          = 5,
 		enchAquaAffinity         = 6,
 		enchThorns               = 7,
+		enchDepthStrider         = 8,
 		enchSharpness            = 16,
 		enchSmite                = 17,
 		enchBaneOfArthropods     = 18,
-- 
cgit v1.2.3


From fbd0cf74bdc3a6c3a2524691da07e4ac4ad7940d Mon Sep 17 00:00:00 2001
From: Jonathan Fabian <jonfabe@github>
Date: Sun, 21 Dec 2014 23:02:02 -0500
Subject: Fix compile error on OS X introduced by commit
 ecf778bbec2794562bf5e5b8645e2171f7cd081c

The following error occurs on OS X with the order reversed: `MCServer/src/World.cpp:282:2: error: field 'm_LastSave' will be initialized after field 'm_LastUnload' [-Werror,-Wreorder] m_LastSave(0),`.    Reversing the order of initialization fixes this.
---
 src/World.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/World.cpp b/src/World.cpp
index cd17cde08..ae739a2c3 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -279,8 +279,8 @@ cWorld::cWorld(const AString & a_WorldName, eDimension a_Dimension, const AStrin
 	m_WorldAge(0),
 	m_TimeOfDay(0),
 	m_LastTimeUpdate(0),
-	m_LastSave(0),
 	m_LastUnload(0),
+	m_LastSave(0),
 	m_SkyDarkness(0),
 	m_GameMode(gmNotSet),
 	m_bEnabledPVP(false),
-- 
cgit v1.2.3